Auto merge of #1476 - brson:installer, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 2 Apr 2015 18:35:52 +0000 (18:35 +0000)
committerbors <bors@rust-lang.org>
Thu, 2 Apr 2015 18:35:52 +0000 (18:35 +0000)

Trivial merge